Auto merge of #1452 - alexcrichton:issue-1355, r=huonw

The hashes would occasionally disappear when the main package registry overwrote
a previous registry source, so this just adds logic to load hashes if they're
missing.

Closes #1355

diff --cc src/cargo/core/registry.rs
Simple merge

diff --cc src/cargo/sources/registry.rs
Simple merge